Refactoring interface code, bulb discovery