Removed timesRun / cleaned up classes