Move style into class rather than using external loading