Reverted fixes code-style