Improved Java Code Conventions compliance