CardIndex 2.8

Code refactoring