Reduced line length to 72char for all functions