Introspection example and some more cleanup