Clean up between (now) different layers of the system
Dealing with license headers and formatting
Enhance template lookup