[wip] Style Cleanups