[18] More code cleanup and documenting
[18] Finished documenting code