Fixed if-statement and commenting consistency