Moved deoverlap code to Molecule.
Formatting fixes.