Use IntelliJ's awesome code reformatting to clean everything up