Code cleanup. Fixed xml errors.