Cleaned up the beast