Hackathon fixes

IntelliJ did strange things with whitespaces in this project :/