Fix lots of whitespace stuff

@Xyresic remember to set your eclipse to not use tabs for indentation!!