Simplified the T4 files a bit