Minor styling
wip migrate to 0.22