Cleaned up data templates