Roomba connect refactor