Removed warnings in xml
(Refactor)
Show some comments.
Refactor