Fixing Lint Errors