Tweak code style and add extract test
0.1.2