refactored around commit