In which substance is the mass fraction of hydrogen higher: in water or in methane?

In which substance is the mass fraction of hydrogen higher: in water or in methane? and the amount in each of the substances?

Given:
H2O
CH4

Find:
ω (H in H2O) -?
ω (H in CH4) -?
n (H in H2O) -?
n (H in CH4) -?

1) Mr (H2O) = Ar (H) * N (H) + Ar (O) * N (O) = 1 * 2 + 16 * 1 = 18;
2) ω (H in H2O) = N (H in H2O) * Ar (H) * 100% / Mr (H2O) = 2 * 1 * 100% / 18 = 11.11%;
3) Mr (CH4) = Ar (C) * N (C) + Ar (H) * N (H) = 12 * 1 + 1 * 4 = 16;
4) ω (H in CH4) = N (H in CH4) * Ar (H) * 100% / Mr (CH4) = 4 * 1 * 100% / 16 = 25%;
5) n (H in H2O) = n (H2O) * 2 = 1 * 2 = 2 mol;
6) n (H in CH4) = n (CH4) * 4 = 1 * 4 = 4 mol.

Answer: The mass fraction of hydrogen is greater in CH4; the amount of substance H in H2O is 2 mol; in CH4 – 4 mol.