clean-up on code