reorganized CHA methods to follow a more logical structure