about start refactoring and fixed broken edit