Refactored User & Game classes