Updates requested by Proquest on January 8th, 2013. Reverted the parsing
of addresses and remove extranious whitespace.