testing: All tests passed, code reformat