Refactoring for more good Go-ness