clean it up a bit - no change to functionality