Connect with controller
Fix infinite loop
Lint fix