code clean up
small refactor
candy search droid init check in