Cleaning up Executable.cs