Tweaks and clean up