cleaning refactorç