Some more cleanup
Add a bit of stuff to AbstractRunnable