Corrected line lengths, cleaned up headers