@wip fix some more whitespace