make code more go-stylish, phase#1