got it on the tidying part...thx...