Nitpick cleaning on one theme and starting designing another