Refactor up