simplify @vbkaisetsu 's contributions