Refactor and clean-up