most of the brush type refactoring, some Kazoemashou stuff