527 Refactoring