code cleaning and method renaming

Change-Id: I034b9d1f989a3280db9c35d03e3cfae2d144f076