More performance improvements - moving calculation of bonds next to atom...

...s to a single place (so we don't loop over the bonds in a molecule multiple times), and removing some integer parsing that was un-needed