Changed the decision on how to fit burrows
Some cleanup