Cleanup and refactor style classes