minor refactoring.

Created by  jesse <nicoty@tuta.io>  on April 25, 2020
7SRULDRFXA6ZZUEXRPCDO7NIUJDREKYI3ESUYTOXMSPVMORDJXIQC
Change contents