Cleaned up pytrino some more.