[minor] rewriting package