Continued development of simplification.
Updated bootstrap 2.3