removing not necessary short-ifs