Formatting fixes, some tweaks based on feedback