rename points variables
refactor event listeners