Fixed Lint errors/suggestions.