Merge pull request #3 from eosrei/develop

Cleanup and minor linting fixes