Cleaned up formatting
These are generated at build time