Clean
Make curly like do-end
Clean
fix test