Simplification and update
Latest boostrap from Github