[MRG] Avoid duplicated method whenever possible + more robust parameter passing