Cleaning it up a little bit