Make the templates more dryerer