factor a bit
Typos kill kittens /cc @regilero ...