AbstractRunnable fix + some cleanup