Lint warnings clean up