cleaning up
no more separate util
minor edit
basic test
metadata