Learn to clean

Learn to clean with IntelliJ's nice refactor method. Java conventions certified.