made constants more consistant