fix commit script
fix commit script again
fix again
refactoring