Start to clean the new ternary operator code
Continue cleaning code...