make the code more go like