Removed Lint errors