refactoring
small fixed
fix merge