Some refucktoring for SBT
Refucktoring for SBT