Refactored Stats a bit