cleaned it up a touch