cleaned things up, added optimizely