Custom post type refactored and beautified. It's more friendly now