Refactoring and clean-up