added surrounding context in references line
naming cleanup