Refactoring for etyle.