Really cleaned it up this time