Comments, simplification and reorganisation