Code cleanup.  Style and syntax fixes