Version with clean comments