...and some refactoring again
...and some refactoring again

ruippeixotog/beets,ruippeixotog/beets,Kraymer/beets,arabenjamin/beets,untitaker/beets,untitaker/beets,pkess/beets,swt30/beets,jmwatte/beets,shamangeorge/beets,kareemallen/beets,SusannaMaria/beets,LordSputnik/beets,tima/beets,ttsda/beets,drm00/beets,m-urban/beets,arabenjamin/beets,mosesfistos1/beetbox,moodboom/beets,mathstuf/beets,sadatay/beets,lengtche/beets,Andypsamp/CODjunit,PierreRust/beets,Wen777/beets,PierreRust/beets,marcuskrahl/beets,multikatt/beets,ttsda/beets,shanemikel/beets,krig/beets,shamangeorge/beets,mosesfistos1/beetbox,kareemallen/beets,bj-yinyan/beets,mathstuf/beets,randybias/beets,swt30/beets,dfc/beets,randybias/beets,jmwatte/beets,jcoady9/beets,ruippeixotog/beets,asteven/beets,krig/beets,marcuskrahl/beets,lengtche/beets,jackwilsdon/beets,multikatt/beets,diego-plan9/beets,xsteadfastx/beets,Andypsamp/CODjunit,m-urban/beets,Andypsamp/CODfinalJUNIT,asteven/beets,Freso/beets,gabrielaraujof/beets,mried/beets,andremiller/beets,sadatay/beets,jmwatte/beets,arabenjamin/beets,parapente/beets,bj-yinyan/beets,LordSputnik/beets,bj-yinyan/beets,jmwatte/beets,moodboom/beets,randybias/beets,MyTunesFreeMusic/privacy-policy,drm00/beets,marcuskrahl/beets,ibmibmibm/beets,gabrielaraujof/beets,madmouser1/beets,sadatay/beets,lightwang1/beets,LordSputnik/beets,ibmibmibm/beets,YetAnotherNerd/beets,lengtche/beets,dfc/beets,sampsyo/beets,gabrielaraujof/beets,m-urban/beets,bj-yinyan/beets,madmouser1/beets,YetAnotherNerd/beets,shanemikel/beets,mried/beets,MyTunesFreeMusic/privacy-policy,pkess/beets,artemutin/beets,MyTunesFreeMusic/privacy-policy,SusannaMaria/beets,dfc/beets,mried/beets,pkess/beets,multikatt/beets,Dishwishy/beets,lightwang1/beets,dfc/beets,Dishwishy/beets,kareemallen/beets,lightwang1/beets,parapente/beets,kelvinhammond/beets,madmouser1/beets,imsparsh/beets,m-urban/beets,shanemikel/beets,madmouser1/beets,drm00/beets,ruippeixotog/beets,YetAnotherNerd/beets,imsparsh/beets,lightwang1/beets,moodboom/beets,sampsyo/beets,PierreRust/beets,ibmibmibm/beets,artemutin/beets,SusannaMaria/beets,shanemikel/beets,sadatay/beets,kelvinhammond/beets,SusannaMaria/beets,sampsyo/beets,asteven/beets,jcoady9/beets,Dishwishy/beets,Dishwishy/beets,kelvinhammond/beets,Andypsamp/CODfinalJUNIT,Kraymer/beets,Andypsamp/CODjunit,artemutin/beets,Kraymer/beets,mathstuf/beets,Andypsamp/CODjunit,pkess/beets,shamangeorge/beets,jcoady9/beets,tima/beets,arabenjamin/beets,diego-plan9/beets,ibmibmibm/beets,drm00/beets,sampsyo/beets,Freso/beets,parapente/beets,jcoady9/beets,kareemallen/beets,Andypsamp/CODjunit,diego-plan9/beets,lengtche/beets,moodboom/beets,Kraymer/beets,jackwilsdon/beets,LordSputnik/beets,mathstuf/beets,jackwilsdon/beets,MyTunesFreeMusic/privacy-policy,multikatt/beets,untitaker/beets,xsteadfastx/beets,Andypsamp/CODfinalJUNIT,Andypsamp/CODfinalJUNIT,Andypsamp/CODfinalJUNIT,tima/beets,jackwilsdon/beets,ttsda/beets,beetbox/beets,mried/beets,Wen777/beets,asteven/beets,mosesfistos1/beetbox,untitaker/beets,ttsda/beets,andremiller/beets,Freso/beets,imsparsh/beets,shamangeorge/beets,beetbox/beets,diego-plan9/beets,imsparsh/beets,beetbox/beets,krig/beets,kelvinhammond/beets,swt30/beets,mosesfistos1/beetbox,xsteadfastx/beets,andremiller/beets,artemutin/beets,tima/beets,parapente/beets,beetbox/beets,PierreRust/beets,swt30/beets,Wen777/beets,YetAnotherNerd/beets,Freso/beets,marcuskrahl/beets,randybias/beets,xsteadfastx/beets,gabrielaraujof/beets