Fix logic
Remove explicit class name
Extract #decompose_atom to improve readability