Keep fixing and simplifying.