Made templates a bit more compact