fixed formatting issues
Merge branch 'dev' into fix/maxhelp-update