Cleaned up templates