Mass reformat, keep it looking nice!

Some minor problems i reckon, wap it in eclipse and ctrl + A then ctrl + I to make sure the reformat is 100% correct.