style clean up

Change-Id: I4a318ce65ef2270124335123f9d2a4d302807442
more progress

Change-Id: I4d433220025d874d428fac4492ab345d9c548eb0
progress

Change-Id: Ie328318e48718793ed6423e89288b989556ae041