STYLE: standardize if/else statements and indents