Make 2 times faster, extract spacers

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>