code clean up package refactor