Fix bug where GET commands also needed a value, refactor