clean is now better built