Add collapsible option to accordion
Cleanup: Statistics class