* refactorings in cardtec