Abstracted styles names to use non-sql nomenclature
Migrated styles to Data
Minor refactoring and style