Refactoring: now we have separate classes for points and colors