Cleaned up the PlayerListener code