Linting

TODO: linting API rewrite