(refactor) refactored code to accomodate automatic test runners