WTemplate little cleanup