Apply suggestions from DHH.