Refactoring & Complement