multibar clean up & refactor