Source format improvement