Fix avl header

Cleanup of the avl header.