Formatting tweaks to better match existing code #241