bootstrap works, cleaning up