Just a slight refactor.
Problem 2 in go.