Cleanup and Tweak More

Change-Id: I0df9de5f14654860308b1bdb116a526058bcaacb