Small amount of linting and refactoring