Close cursor on isWatchConnected

Also some small refactor to the method