(maint) Pass lint and cleanup
Merge pull request #6 from xaque208/lint

(maint) Pass lint and cleanup