Fixed lint issues