Refactors from the Go Bootcamp