refactored a bit
refactored a bit

suitupalex/yarn,onemen/yarn,MiguelAlho/yarn,MiguelAlho/yarn,ConAntonakos/yarn,andreypopp/esy,bsansouci/esy,mgcrea/yarn,seripap/emojiless-yarn,troydemonbreun/yarn,kasperlewau/yarn,mourner/yarn,joeyespo/yarn,FLGMwt/yarn,mvestergaard/yarn,onemen/yarn,lawliet89/yarn,dguo/yarn,andreypopp/esy,lawliet89/yarn,suitupalex/yarn,ConAntonakos/yarn,CHECK24/yarn,seripap/emojiless-yarn,mourner/yarn,mvestergaard/yarn,kasperlewau/yarn,andreypopp/esy,dxu/yarn,FLGMwt/yarn,troydemonbreun/yarn,dxu/yarn,CHECK24/yarn,joeyespo/yarn,dguo/yarn,bsansouci/esy,mgcrea/yarn,bsansouci/esy