Updated package name
Extract method refactoring