minor cleanup
added true reactive syntax (including subordinate where-declarations