WIP revert unrelated formatting