cleanup, mostly of the "make this beautiful three line function into an ugly ten liner" variety
rephrasings