Cleaned it up!