Edit comments & spacing