Continue to clean up wording and views.