Merge pull request #38 from sfozz/issue/lint

syntax and formatting cleanup