Changes to style structure. Added a few helper functions.