Moderate Refactoring