Made things more consistant