refactor some invoice