tweaked variable names
format rather than %