Removed cleanDoc and cleaned up comments to conform better