more rafactoring