Con 1298

Please consider using ```if``` statement vs current changes to increase readability.