Fix "drop" command, refactor command line