Consistent // TODO: formatting and removed excess whitespace.
Improved player names.