Refactor callback setup in to use lambda instead of eval