Refactor POst