App code review.

See notes below. @amelialaundy @stevenmathews @adamron1 @RichardGarcia