Cleaning Lint errors