Refactoring - Remove getAtom()

Removed getAtom() function and all calls to it