RoadRunner code refactored