code clean-ups