Major Formatting Cleanup of PlayerListener