Added xml documentation
Removed some redundant stuff