Tweaks and cleanup