Cleanup whitespace

All I have time for at the moment :) It's a start!