Refactoring clean-up