Simplify impl, fix doc typo