Little refactoring of a few templates