Command cleanup, start of adding lookup command