Add function names in comments.
Rename self since it is not used widely in Go