cleaning it up a bit