Bootstrapped
Refactoring cleanup