Tidy and update.