Code cleanup to match online content

First part of cleanup, making code in Github easy to edit offline and drop into browser online.