removed redundant dictionary
added some stuff to ignore