added Department of Defense; cleaned up code