cleaning, zach's tweaks