cleaned out commented-out code, rewrote some conditionals to post-conditionals
divided up big methods a bit more