Rearrange things as suggested at #160