Fix #23 go lint code improvement