Polishing the code after camera+picker coupling