Updates from #126 review.
Updates from #126 review.

DoSomething/northstar,paulhan221/northstar,chloealee/northstar,paulhan221/northstar,axton21/northstar,axton21/northstar,chloealee/northstar,DoSomething/northstar,DoSomething/northstar