Some refactorings within the vsct file.