edits after GoLint hints