Refactor/pythonicize all the things