Refactoring + cleanup

- Broke runner_spec, easy to fix, no time now