Made runner more object-oriented