small package refactoring.