made format more consistant