small cleanup, added second dictionary perminantly