Add tuple map function
Fix comment style