fatt.cc: IMP: small refactoring