comment for refactor more and more