easier reading

also reverts the earlier simplifications