Code refactoring clean-up