Lint Cleanup

Cleaning up some Lint errors