Refactor post