templates minor cleanup, quotes and empty lines.