Code refactored, but yet to add Player class