optimisations requested during code review
optimisations requested during code review

unicef/etools-partnership-management,unicef/etools-partnership-management,unicef/etools-partnership-management,unicef/etools-partnership-management