Localized Bootstrap & Cleanup

Included bootstrap to Repo
Cleanup and comments added