Minor reformats