splitting and minimizing

Change-Id: I95d4310749f5f101e371bcec79dfb324da8513e0