Tidy up /lookup command