updated interface for nested data layer variables
cleanup