Acebinding refactoring then fix surroundings