some changes to usps
Some more cleanup