Neaten up MasterRunnable