Removed unnecessary ternaries