Removed unneeded variables

Combined player variables.  Use ternary operator