Refactored, Unit Test(s) incorporated.