Factorize some parts
1.0.1