cleanup, documenting