Improve sh syntax using ${} for all variables