Reading in file cleanded up in map. -- only change for this commit