Add note about future Java package naming changes
Fix whitespace issues