removed spaces
removed template, using just inline vars