Lint Fixes

These are just **some** of the needed fixes. Will take care of the rest in another PR or this one if not merged.