- code cleanup and documenting