Cleanup some format strings