Refactor of the new setup completion block code