Cleaned it all up