Fix Java Code Conventions non-compliance issues