Bin commented-out unreachable 'break' statements

Change-Id: If0f47a78bbffec5c2ebd33c552d0d8a300b48eb1
Remove superfluous and inconsistent whitespace

Change-Id: I90fdf94aa01912e86015f7263b1dc81d20e53e8d