reformat some stuff

Playing around with IntelliJ 13.1