added linting support; clean up