linting and moving things around