Fixed imports, cleaned up egda.py