Refactoring, codigo lindo

no comments though