Tidy up, add a comment