cosmetic updates

I limited my updates to cosmetic changes because I didn't study the code carefully (yet), don't have all of the dependencies (though I do have Python), and don't want to break anything. Still, please make sure I didn't break anything anyway before merging this. Thanks!