Forgotten template variable and whitespace cleanup