Post type class cleaned up/refactored