Fix some formatting

No more dying unicorns

Change-Id: I381347010f99db6f48c7fc2552525e6ef22b1ca6