Refactored part, cleaning