Revert "Made changes to activities after Stephanie's code review"

This reverts commit dd65d0632ecc556812c42552e5e45daeb2207ac4.