Move logic to extract command to its own function

Move logic to extract command to its own function #142