cleaned up the code a little; removed some things we weren't using or that didn't matter much