Title: Refactoring