Tweaks and cleanup
Connection string