Improve sunrise/sunset data gathering