Refactored runner collecting state

Signed off by: Renan Fichberg <rfichberg@gmail.com>