removed python-like ifs