Clean-up, documenting