Changed hardcoded command Strings to CommandWord constants