Formatting fixes
wip