Optimizzzeee & Refactor