Fixing Lint Errors/Warnings