Some more refactoring
Added XElement extension methods