Consistent variable quoting to avoid possible issues with spaces