Format tweaking mostly