Refactoring (perfomance)