RazielValle: Starting The Refactoring