Minor refactoring, preparing for always translated views