some final code clean-up