Clean up classes for use with styling