More Opsies fixed+Code Cleaning for Space)

Change-Id: Ia0bfd8b2c1aa7974de2e757efd5c39110c0ea873