Fix one typo and improve composition (thanks @harding)