Removed If & Reformatted Code for DFSMap