Formatting and other tweaks