Further refactoring - extract command construction to static factory method