added linting, cleaning up