Fix formatting

I'm used to splitting across lines and avoiding extra brace's... fixed
to be more Bukkity.