Clean up and documenting