Tidy up simplification and comment additions