Tweaks and cleanups