Minor code tweaks

Boolean simplification and braces

Change-Id: I2e8a4fe244e030c230a1aeb595ca056160b7f90d