whitespace + minor refactor on variable names
add street_number field, add activity joins