cleaned up a couple bits