Refactoring. Made package.