Fixed lint warnings
Fixed lint warnings