cleaning up, work in prog

Change-Id: I26aa9ac8086428c03db6d4dd5232c7f351607132
cleaning up and refactoring, work in prog

Change-Id: Idb8bb754cad8747deb4f569865be375e40a258bb