Code review changes from the Bootstrap refactor