Completion handler refactor 2