Rename functions
Add some more godoc
Go fmt