Overal Refactoring