minor refactoring, package name corrected