JSHint compliance

Still working on XML