Refactor pickup activities to use Location object

Also code clean up, renamed some variables to make their purpose more clear,
removed unnecessary variables and code.