Child selector cleanup

Addresses issue #19.