Tidy up / refactor LazyTreeDemo