Make functions a bit more golang-y