Change things around and Clean up

Change-Id: Ib5cdac0a9e7b264f700e75b3c9535f363e70f2bc