Clean formatting

IntelliJ auto-magically cleaned all of this! Hooray!