Formatting
Merge branch 'wip/bashscript-refactoring'