more format tweaking