Cleaned up Director.cs