refactor station points