Minor reformatting tweaks