Style updates
Compile for prod
Cleaned up schema
Clean up schema
Merge branch 'master' into develop