Stat Screen Cleanup, Round 3

* Little more code cleaning
* Added some cock stats