Refactor with APassFor