Refactoring changes

Added image to constructor and removed point2 as it was unnecessary