update everything to be more consistent, and follow (some of) PEP8