Make modifications to satisfy golint