Auto-formatting & cleanup

Also, deprecated PlayerRank because I don't feel like fixing issues (if
any) caused by flat out removing it right now.