Refactor block post