Made format more uniformed