Cleaned up Player code