Cleaned up template organization