Cleaning it up a lil' bit...