[cal10n-dev] Some suggestions based on a code review