Move common code in commands to a function