removed comments and added new ones