Clean up Code

Match the java "standards"