Add comment for class and methos, use tuple