removed bootstrap
refactoring
major refactoring