Tidy up (mostly comments)