Tweaks and style changes