make go vet and golint happy

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>