Initial cleanup of comments