uncommaify between ifs that can potentially be simplified