Minor refactoring
Minor refactoring

cezheng/Ono,egukin/Ono,takeshineshiro/Ono,takeshineshiro/Ono,shopkeep/Ono,egukin/Ono,danielphillips/Ono,cezheng/Ono,sdonly/Ono,mattt/Ono,soheilbm/Ono,shopkeep/Ono,soheilbm/Ono,mattt/Ono,danielphillips/Ono,sdonly/Ono