Code refactoring, no functional changes