template changes and small misc changes

removed spaces used as indentation inside of strings
switched to using single quotes (with double quotes inside of them)
removed unneeded variable and return