small clean up code