code cleanup while reviewing
code cleanup while reviewing