a little more work on refactor post