code cleanup pre review