move a few methods to base class
1 file changed