Refactor clean-up