Cleaned up base templates