Optimize & Refactoring