Cleaned up code (slightly) and created Point class