fewer OCD triggers in core (i.e. beautify)