Slight refactor following merge, linting.