[+-] Mainly readability changes
[+-] Mainly readability changes

This includes changing of the variable names to make more sense, and the
changing of function names to match the previous function name changes.

nbness2/TradingCards