Lint after code review with @whoburg