Made the command constructor clearer