clean up builder a bit, use inverse