reEvaluated the conditional statement

Keep things simple and looking clean