Implemented simplified atom-parsing algorithm
Refactored for atom process