Merge "Abstract and refactor Tidy support"