cleaned a few things up