Refactoring: remove angle because it can be computed form current & latest leaf