Lint pass

depends on #86