Refactor picker controller