Refactor/clean-up