Helper classes and typo in expand section