Finish up refactoring to let block