cleaning up, documenting