Cleanup

IntelliJ rocks.