Renamed constants, made format string dict argument optional