P: refactoring
J: removed (now) redundant execution test