Cleaned up auto gen specs