Cleanup and Tweak More

once again sorry...my bad

Change-Id: Iaf65163cd25ba5610bbd53beb4df9ed1840ac671