Cleanup salvage.cs a little... no functional changes