543 Refactoring