Minor stlye cleanups.
More work on fleshing out the system