Add bootstrap and clean up