Code cleanup
Merge branch 'master' into 1-go-metrics

Conflicts:
	main.go
	service/service.go