More linting and cleanup.
Comment this in case someone else wonders why its there.