Edited comments as required