(Activity) Code cleanup changes from self-review.