A small refactoring
The last version of ATK14