Adding runner concept

Redundant `return` detected.