#11 presentations per locale management and code refactoring