Cleanup
Fix Templates