Make a bit more consistent