code clean-up 1