different layer and styles for points, clean up the code