Fix in template + Cleaning