Made some more changes to please the linter.