Moved all the static catalog definitions to a separate class and only exposed the used variables.
Coding style updates.
Egyptian braces. No inline if statements. Indentation changes.