Working on cleaning up documentation comments