cleaned it up