Minor code optimization

Also removed comments about XML files