another round of code clean-up