- code clean-up