* Another code refactor
* UnitTest Issue #3