Cleanup lint issues
Cleanup lint issues