refactoring + finishing line bootstrap