code cleanup while reviewing