Did a lot of cleanup.  Also much styling added.