Code fixes so it passes linting