[VS,MM]{refactoring} data storage for points