Format changes and byte saving