Fixed Lint issues