Minor cleanup, added PhotmoAtom class