Support VZW Galaxy Stellar, misc. whitespace cleanup