refactor & UT report