Changed multiple return points to else clause.