Cleaned up base template