lil cleanup and such

Change-Id: I2267a25e78133ba3090441382d30d9ba8e20b80d
.

Change-Id: Ia5e4b06bb283c437fb9efadc4d3a2ee9260bfad8