refactored commits and commit components