small optimisation in core style