Further clean-up of mortality app