More tweaking to conform with linting