xmllint'ed + removed comments and fixed log