Simplified AVL tree usage

Signed-off-by: Alex Lourie <djay.il@gmail.com>