Cleanup lint errors