cleanup code

- require package class
- cleanup code