Follow original code and use do..end in enumerator blocks