Tweaks and formatting