Prettify and use #each_with_object