Make more consistent