Refactored schema fields to be separate objects
Removed redundant code and comments