Clean XML + corrected bug with add method