Refactor (Otimize code)