code clean-up...