Some format tweaking...