cleaning this up a bit