Formatting and tweaks