Some comments and a small tidy up