Add suggestions from golint