Refactor Spidercommand a bit