Removed unnecessary @XmlElement notation and added comments