refactor code after marge