Tidy up some comments.
Move code to where it's gonna be.