Minor refactor to own BST implementation