Minor Tweaks and Clean Up