removed a package, some cosmetic changes.