[agge]

So we make it many small commitable refactorings instead :)