Tidy up whitespace and stuff