Tidy up formatting & comments.