Refactor: Simplified templates