Fixing lint errors.

Re-introduced some kwargs and args there were here originally.
These will require some additional refactoring to fully remove.