Coding Standards fix (if statements)