Simplified, fixed warning