fixup! [wip] Style Cleanups