Cleanup

Cleanup for instance.go and Connect helper