Fix indentation

Change-Id: Ic009b2d9cbb4bbd37aad044e63f1b19ae57e649e
else is not needed after break/return

Change-Id: I3c7a90345e9f748668cc2e5305bccae99a45c479
Bail out early

Change-Id: Id2a77996cfe9a9ec755766295141123870b4eaf2
Use += when possible

Change-Id: I6dad55d3a397becab18f1159f3e8d84cffd7517b