small changes, mostly linting stuff