Removed if expression, it just bloats the code