before clean codes
Clean up the code
Merge branch 'master' of https://github.com/geworkbench-group/geworkbench-web
Merge branch 'master' of https://github.com/geworkbench-group/geworkbench-web
Merge with latest main
Clean code. Enhance performance