Cleaning up to OOP
Cleaned up Player class