code cleanup during review