bootsrap: add comments + refactor