Tweaks & cleanup