cleared some go lint comments