Fix block alignment
Use Kernel#loop with break rather than begin/end/until(or while)