Updates

Updated the app code based on feedback from one of the technical
reviewers.