Minor fixes-
* Decoupling several classes, separating logic code from instantiation code.
Minor fixes-
* Decoupling several classes, separating logic code from instantiation code.
Minor fixes-
* Decoupling several classes, separating logic code from instantiation code.