Command cleanup, rewrite reloading