Refactored attributes to suit Java Code Conventions
:octocat: