cleanup
refactoring: Bootstrap based rendering