clean this up a bit from last commit