Refactored, rejiggered, made more betterer