Performance Related Refactoring