clean up code during review