US543 More refactoring