modified function names to match http://golang.org/doc/effective_go.html#names