commit pre some refactor