clean-up code for review