- simplify cak7 code (thanks to lpm11 and for all who tested)