Initial refactoring commint