Some tweaks for formatting