Cleanup

Hey,

Just cleaned up some idiomatic stuff, and a potential bug with a double init of the run queue.