XML Comments fixed, Refactored