Refactor functions.sh script