Cleaned up single template