More changes to style and grouping of functions and such