renamed some variables to abide google c++ style guidelines. added some assertions