moved methods to classes