Adding common variables to bootstrap
Minor code style fix