Tweaks and cleanup
Additional cleanup