cleanup +creating classes