Refactoring the internals of org.vaadin.teemu.clara.inflater.