Add comments and remove obsolete comments