Indent fix + readd AccordionStateHelper