Clean up

Mostly updates to Go 1.1 syntax