Build for Memorize effect
Mini refactoring