Consolidate string components in one class to simplify maintenance
Cleanup unused headers
Make the "new" expression use a standard visual layout
Use a keyword default symbol styles for some items