Clean bootstrap and refactor product