on his deathbed, he got a visit from the 16-year-old music student ferdinand hiller. the day after the death of beethoven, ferdinand hiller cut off a lock of hair from his role model as was usual custom at that time.

How would the previous sentence be correctly capitalized?
On his deathbed, he got a visit from the 16-year-old music student Ferdinand Hiller. The day after the death of Beethoven, Ferdinand Hiller cut off a lock of hair from his role model as was usual custom at that time.