Some cleaning in the atom part