Code cleanup, mostly for the sake of cleaner godoc output