Tweaks to style and code