Preparing for listeners and cleaning up / fixing runnables