Resolved more Lint Warnings