Boostrap refactor