Trailing Refactoring changes