Refactored proxy locations
Changed tab characters to spaces; please use adhere to this convention