package refactors