Finish Refactoring Atom.py