simplify bootstrap
cleanup code, add comments
cleanup code, add comments