Refactored refactor post