More minor cleanup
Transfers over the completion block. Kinda critical, and really it should just be copied.