A refactored version
Better Math and Player Names