Fixed lint violations