Refactor word-cloud: Introduce Point class