Boot strap
Formal refactory