Be a bit more consistent