Fixed major Lint errors