Tweaking the astyle
Further tweaks to the style