Refactor binary's buildCommand

Be more “commander-like”