Removed duplicating code from Player class