Cleaned up structure for RTL templating