Refactoring and clean-up, plus commenting out of test-execution of unimplemented methods