Some code cleanups
- [ ] closes #xxxx
- [ ] tests added / passed
- [x] passes `black pandas`
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [ ] whatsnew entry

Seems to have introduced a few test failures? Generally looks good Thanks @MomIsBestFriend 