Minor OCD tweaks

Change-Id: I17338bff58fdd34446d03a4af1b37abb4622b5d1