Clean up comments
Clean up comments
Set default variant to zero