Refactor BEMTREE

// cc @tavriaforever @gela-d @tormozz48 
`data` -> `date`