adding suggestions from PR