Removed coordinate object - refactored to generators for better memory usage