Latest syntax & style changes

I've gone through the whole thing for syntax & style.  This should be the last lint-ed and parser checked commit.  I'll move to structure afterward.