Code cleanup. Updated outdated docblocks