code cleanup for PR