Refactor and clean up the post