moving comment to appropriate place