Cleaned up Player Class