formatting fixes for cityscape formatter