Cleanup parameters used in quoted strings

Without this commit there are variables called from quoted strings
without having the name of the variable in curly braces. This is not
terrible, but is bad practice and bad style.

This commit adds the proper curly braces to the variables to align with
best practices.