GH-18 Style changes