wip(shellscripts): Refactoring