Even simpler, removed unused params