Simplify 'if' & Add 'for'