empresa-0.4 - Refactoring