Some linting and cleanup.