Multiple selection support + Code cleaned