moves some methods as private