Results of review - consolidated if statements, commented further