Adds cosmetic changes to make it easier to pick moves
Refactors many methods; did not change functionality.