resolve CLI arguments mess