Improve distribution of code across files.  Improve styling.