Cleanup

some cleanups and improvements

Change-Id: I414ebf61a73e4dc7cc2ff8b97c6bb5914fe1aea7