Moved CPR check into own module