Linted.
Tweaked some things for linting.