Line2D added + refactoring